X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3b9f782ef3949f583e8ac53795d36787f044fc3..60435227b10297510316a88f67758fb6b6d93c10:/src/motif/accel.cpp diff --git a/src/motif/accel.cpp b/src/motif/accel.cpp index 3aad0fb5b5..d25b4c145f 100644 --- a/src/motif/accel.cpp +++ b/src/motif/accel.cpp @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: // Created: 17/09/98 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -45,8 +44,7 @@ wxAcceleratorRefData::wxAcceleratorRefData() wxAcceleratorRefData::~wxAcceleratorRefData() { - delete[] m_entries; - m_entries = NULL; + wxDELETEA(m_entries); m_count = 0; } @@ -108,8 +106,8 @@ bool wxAcceleratorEntry::MatchesEvent(const wxKeyEvent& event) const bool accShiftDown = ((GetFlags() & wxACCEL_SHIFT) == wxACCEL_SHIFT); int accKeyCode = GetKeyCode(); int accKeyCode2 = GetKeyCode(); - if (isascii(accKeyCode2)) - accKeyCode2 = tolower(accKeyCode2); + if (wxIsascii(accKeyCode2)) + accKeyCode2 = wxTolower(accKeyCode2); return ((eventAltDown == accAltDown) && (eventCtrlDown == accCtrlDown) && (eventShiftDown == accShiftDown) &&