int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
{
- if (!Ok()) return -1;
+ if (!IsOk()) return -1;
wxAccelList::compatibility_iterator node = M_ACCELDATA->m_accels.GetFirst();
while (node)
{
wxAcceleratorEntry *entry = node->GetData();
if ((event.m_keyCode == entry->GetKeyCode()) &&
- (((entry->GetFlags() & wxACCEL_CTRL) != 0) == event.ControlDown()) &&
+ (((entry->GetFlags() & wxACCEL_RAW_CTRL) != 0) == event.ControlDown()) &&
(((entry->GetFlags() & wxACCEL_SHIFT) != 0) == event.ShiftDown()) &&
(((entry->GetFlags() & wxACCEL_ALT) != 0) == event.AltDown()) &&
- (((entry->GetFlags() & wxACCEL_CMD) != 0) == event.CmdDown()))
+ (((entry->GetFlags() & wxACCEL_CTRL) != 0) == event.CmdDown()))
{
return entry->GetCommand();
}