X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/412e0d47c05d69cb029e9dbd11b31ce24fb2377e..cb305e1e9ff819725734250d3020c1a074ef8174:/src/mac/carbon/accel.cpp diff --git a/src/mac/carbon/accel.cpp b/src/mac/carbon/accel.cpp index 1ca16d6c29..839184384c 100644 --- a/src/mac/carbon/accel.cpp +++ b/src/mac/carbon/accel.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: accel.cpp +// Name: src/mac/carbon/accel.cpp // Purpose: wxAcceleratorTable // Author: Stefan Csomor // Modified by: @@ -12,7 +12,10 @@ #include "wx/wxprec.h" #include "wx/accel.h" -#include "wx/string.h" + +#ifndef WX_PRECOMP + #include "wx/string.h" +#endif IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject) @@ -33,7 +36,7 @@ class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData friend class WXDLLEXPORT wxAcceleratorTable; public: wxAcceleratorRefData(); - ~wxAcceleratorRefData(); + virtual ~wxAcceleratorRefData(); wxAccelList m_accels; }; @@ -90,7 +93,8 @@ 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() || event.MetaDown())) + (((entry->GetFlags() & wxACCEL_ALT) == 0) || event.AltDown()) && + (((entry->GetFlags() & wxACCEL_CMD) == 0) || event.CmdDown())) { return entry->GetCommand(); } @@ -99,5 +103,3 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event ) return -1; } - -