#include "wx/msw/private.h"
-extern WXWORD wxCharCodeWXToMSW(int id, bool *isVirtual);
-
IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
// ----------------------------------------------------------------------------
{
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;