X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/adc27ddcb536d711f2940f0d0db258ae5e61eb6d..0afeb753e0a6a3fdba290bf3612bb2f012d44d95:/src/osx/accel.cpp diff --git a/src/osx/accel.cpp b/src/osx/accel.cpp index 08e8140cdd..90bd1fd920 100644 --- a/src/osx/accel.cpp +++ b/src/osx/accel.cpp @@ -86,17 +86,17 @@ bool wxAcceleratorTable::IsOk() const 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.RawControlDown()) && (((entry->GetFlags() & wxACCEL_SHIFT) != 0) == event.ShiftDown()) && - (((entry->GetFlags() & wxACCEL_ALT) != 0) == event.AltDown()) && - (((entry->GetFlags() & wxACCEL_CMD) != 0) == event.CmdDown())) + (((entry->GetFlags() & wxACCEL_ALT) != 0) == event.AltDown()) && + (((entry->GetFlags() & wxACCEL_CTRL) != 0) == event.ControlDown())) { return entry->GetCommand(); }