X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a31a5f85341a2ef131d86a1dee12f3d6c8156118..3c86150dd768b4e490b603227de28aa57275ee4b:/src/mac/carbon/accel.cpp?ds=inline diff --git a/src/mac/carbon/accel.cpp b/src/mac/carbon/accel.cpp index 14aa88e53a..16d871aeb0 100644 --- a/src/mac/carbon/accel.cpp +++ b/src/mac/carbon/accel.cpp @@ -52,7 +52,7 @@ wxAcceleratorRefData::wxAcceleratorRefData() wxAcceleratorRefData::~wxAcceleratorRefData() { - m_accels.DeleteContents( TRUE ); + WX_CLEAR_LIST( wxAccelList, m_accels ); } wxAcceleratorTable::wxAcceleratorTable() @@ -88,10 +88,10 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event ) { if (!Ok()) return -1; - wxAccelList::Node *node = M_ACCELDATA->m_accels.GetFirst(); + wxAccelList::compatibility_iterator node = M_ACCELDATA->m_accels.GetFirst(); while (node) { - wxAcceleratorEntry *entry = (wxAcceleratorEntry*)node->GetData(); + wxAcceleratorEntry *entry = node->GetData(); if ((event.m_keyCode == entry->GetKeyCode()) && (((entry->GetFlags() & wxACCEL_CTRL) == 0) || event.ControlDown()) && (((entry->GetFlags() & wxACCEL_SHIFT) == 0) || event.ShiftDown()) &&