X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..0d3ba5ebc6dfc8fa012b0dd562b57143f45babf3:/src/generic/accel.cpp diff --git a/src/generic/accel.cpp b/src/generic/accel.cpp index 50a7f9faaa..65f0fa94f2 100644 --- a/src/generic/accel.cpp +++ b/src/generic/accel.cpp @@ -97,9 +97,7 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[] { const wxAcceleratorEntry& entry = entries[i]; - int keycode = entry.GetKeyCode(); - if ( wxIslower(keycode) ) - keycode = wxToupper(keycode); + int keycode = wxToupper(entry.GetKeyCode()); M_ACCELDATA->m_accels.Append(new wxAcceleratorEntry(entry.GetFlags(), keycode, @@ -181,8 +179,7 @@ wxAcceleratorTable::GetEntry(const wxKeyEvent& event) const // now check flags if ( (((flags & wxACCEL_CTRL) != 0) == event.ControlDown()) && (((flags & wxACCEL_SHIFT) != 0) == event.ShiftDown()) && - (((flags & wxACCEL_ALT) != 0) == - (event.AltDown() || event.MetaDown())) ) + (((flags & wxACCEL_ALT) != 0) == event.AltDown()) ) { return entry; }