X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/96dabe431382e288fc1ccc561f62c400895ac0fa..ab2ef6e0e6886a5ef0861399125075a9cba75508:/src/osx/accel.cpp diff --git a/src/osx/accel.cpp b/src/osx/accel.cpp index d1d535207d..14f0b1887a 100644 --- a/src/osx/accel.cpp +++ b/src/osx/accel.cpp @@ -11,14 +11,14 @@ #include "wx/wxprec.h" +#if wxUSE_ACCEL + #include "wx/accel.h" #ifndef WX_PRECOMP #include "wx/string.h" #endif -#ifndef __WXUNIVERSAL__ - IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject) // ---------------------------------------------------------------------------- @@ -86,7 +86,7 @@ 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) @@ -95,7 +95,7 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event ) if ((event.m_keyCode == entry->GetKeyCode()) && (((entry->GetFlags() & wxACCEL_CTRL) != 0) == event.ControlDown()) && (((entry->GetFlags() & wxACCEL_SHIFT) != 0) == event.ShiftDown()) && - (((entry->GetFlags() & wxACCEL_ALT) != 0) == event.AltDown()) && + (((entry->GetFlags() & wxACCEL_ALT) != 0) == event.AltDown()) && (((entry->GetFlags() & wxACCEL_CMD) != 0) == event.CmdDown())) { return entry->GetCommand(); @@ -106,4 +106,4 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event ) return -1; } -#endif \ No newline at end of file +#endif // wxUSE_ACCEL