]> git.saurik.com Git - wxWidgets.git/commitdiff
When handling accelerators in wxWebView make sure that we do not block right-alt...
authorSteve Lamerton <steve.lamerton@gmail.com>
Thu, 17 Jan 2013 09:57:37 +0000 (09:57 +0000)
committerSteve Lamerton <steve.lamerton@gmail.com>
Thu, 17 Jan 2013 09:57:37 +0000 (09:57 +0000)
Fixes #14974.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/msw/webview_ie.cpp

index 093707bb17d83c4097484b73d2b8ba07bcca150b..a5e3c130ae9ee3435082509a43848443f8ae378f 100644 (file)
@@ -1620,8 +1620,10 @@ HRESULT wxSTDCALL DocHostUIHandler::TranslateAccelerator(LPMSG lpMsg,
 {
     if(lpMsg && lpMsg->message == WM_KEYDOWN)
     {
 {
     if(lpMsg && lpMsg->message == WM_KEYDOWN)
     {
-        //control is down?
-        if((GetKeyState(VK_CONTROL) & 0x8000 ))
+        // check control is down but that it isn't right-alt which is mapped to
+        // alt + ctrl
+        if(GetKeyState(VK_CONTROL) & 0x8000 && 
+         !(GetKeyState(VK_MENU) & 0x8000))
         {
             //skip the accelerators used by the control
             switch(lpMsg->wParam)
         {
             //skip the accelerators used by the control
             switch(lpMsg->wParam)