X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3b9f782ef3949f583e8ac53795d36787f044fc3..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/motif/accel.cpp?ds=sidebyside diff --git a/src/motif/accel.cpp b/src/motif/accel.cpp index 3aad0fb5b5..d66f03b8af 100644 --- a/src/motif/accel.cpp +++ b/src/motif/accel.cpp @@ -45,8 +45,7 @@ wxAcceleratorRefData::wxAcceleratorRefData() wxAcceleratorRefData::~wxAcceleratorRefData() { - delete[] m_entries; - m_entries = NULL; + wxDELETEA(m_entries); m_count = 0; } @@ -108,8 +107,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) &&