Correction to accelerator bug fix: add FVIRTKEY if ctrl, alt or shift

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

diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index 1c4c6fe2cf0b34a936866a36943e2443b591aa5f..0e86f39c36e2a29e6f6e05d526145be79fe15b35 100644 (file)
--- a/src/msw/accel.cpp
+++ b/src/msw/accel.cpp
@@ -108,11 +108,20 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
     {
         BYTE fVirt = 0;
         if (entries[i].m_flags & wxACCEL_ALT)
     {
         BYTE fVirt = 0;
         if (entries[i].m_flags & wxACCEL_ALT)

+        {

             fVirt |= FALT;
             fVirt |= FALT;

+            fVirt |= FVIRTKEY;
+        }

         if (entries[i].m_flags & wxACCEL_SHIFT)
         if (entries[i].m_flags & wxACCEL_SHIFT)

+        {

             fVirt |= FSHIFT;
             fVirt |= FSHIFT;

+            fVirt |= FVIRTKEY;
+        }

         if (entries[i].m_flags & wxACCEL_CTRL)
         if (entries[i].m_flags & wxACCEL_CTRL)

+        {

             fVirt |= FCONTROL;
             fVirt |= FCONTROL;

+            fVirt |= FVIRTKEY;
+        }

 
         bool isVirtual;
         WORD key = wxCharCodeWXToMSW(entries[i].m_keyCode, & isVirtual);
 
         bool isVirtual;
         WORD key = wxCharCodeWXToMSW(entries[i].m_keyCode, & isVirtual);