X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..dd107c50be43e8d4dbdba20df162faf119a3781c:/src/msw/accel.cpp?ds=sidebyside

diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index e433443dd3..0e86f39c36 100644
--- a/src/msw/accel.cpp
+++ b/src/msw/accel.cpp
@@ -108,15 +108,25 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
     {
         BYTE fVirt = 0;
         if (entries[i].m_flags & wxACCEL_ALT)
+        {
             fVirt |= FALT;
+            fVirt |= FVIRTKEY;
+        }
         if (entries[i].m_flags & wxACCEL_SHIFT)
+        {
             fVirt |= FSHIFT;
+            fVirt |= FVIRTKEY;
+        }
         if (entries[i].m_flags & wxACCEL_CTRL)
+        {
             fVirt |= FCONTROL;
+            fVirt |= FVIRTKEY;
+        }
 
         bool isVirtual;
         WORD key = wxCharCodeWXToMSW(entries[i].m_keyCode, & isVirtual);
-        fVirt |= FVIRTKEY;
+        if (isVirtual)
+            fVirt |= FVIRTKEY;
 
         WORD cmd = entries[i].m_command;
 
@@ -162,7 +172,6 @@ WXHACCEL wxAcceleratorTable::GetHACCEL() const
 bool wxAcceleratorTable::Translate(wxWindow *window, WXMSG *wxmsg) const
 {
     MSG *msg = (MSG *)wxmsg;
-
     return Ok() && ::TranslateAccelerator(GetHwndOf(window), GetHaccel(), msg);
 }