X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0c133e13b36a923c65f94499554e432bc3a0daa..534090e354ebd5b4c42e6c27a6aa6073c0ef669e:/src/msw/accel.cpp diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp index dfcb758f2b..f3e2f10c7f 100644 --- a/src/msw/accel.cpp +++ b/src/msw/accel.cpp @@ -34,8 +34,6 @@ #include "wx/msw/private.h" -extern WXWORD wxCharCodeWXToMSW(int id, bool *isVirtual); - IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject) // ---------------------------------------------------------------------------- @@ -105,19 +103,15 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[] { int flags = entries[i].GetFlags(); - BYTE fVirt = 0; + BYTE fVirt = FVIRTKEY; if ( flags & wxACCEL_ALT ) - fVirt |= FALT | FVIRTKEY; + fVirt |= FALT; if ( flags & wxACCEL_SHIFT ) - fVirt |= FSHIFT | FVIRTKEY; + fVirt |= FSHIFT; if ( flags & wxACCEL_CTRL ) - fVirt |= FCONTROL | FVIRTKEY; - - bool isVirtual; + fVirt |= FCONTROL; - WORD key = wxCharCodeWXToMSW(entries[i].GetKeyCode(), &isVirtual); - if (isVirtual) - fVirt |= FVIRTKEY; + WORD key = wxCharCodeWXToMSW(entries[i].GetKeyCode()); arr[i].fVirt = fVirt; arr[i].key = key;