missing commit

[wxWidgets.git] / src / motif / accel.cpp

diff --git a/src/motif/accel.cpp b/src/motif/accel.cpp
index 3aad0fb5b533a8f29bf1d9e62a1b00d064c5421c..d66f03b8af79db21800672fdd68fe2da97779cd4 100644 (file)
--- 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) &&