X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d84afea9d1ec41ee4e2ebb3bf6b87926cf5f04d1..bf60426831535738b1b784629f08e9dd00bf9ecc:/src/mac/carbon/accel.cpp?ds=sidebyside diff --git a/src/mac/carbon/accel.cpp b/src/mac/carbon/accel.cpp index 798aa72026..0623dc8dd5 100644 --- a/src/mac/carbon/accel.cpp +++ b/src/mac/carbon/accel.cpp @@ -65,7 +65,7 @@ wxAcceleratorTable::~wxAcceleratorTable() } // Create from an array -wxAcceleratorTable::wxAcceleratorTable(int n, wxAcceleratorEntry entries[]) +wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]) { m_refData = new wxAcceleratorRefData; @@ -88,10 +88,10 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event ) { if (!Ok()) return -1; - wxNode *node = M_ACCELDATA->m_accels.First(); + wxAccelList::Node *node = M_ACCELDATA->m_accels.GetFirst(); while (node) { - wxAcceleratorEntry *entry = (wxAcceleratorEntry*)node->Data(); + wxAcceleratorEntry *entry = (wxAcceleratorEntry*)node->GetData(); if ((event.m_keyCode == entry->GetKeyCode()) && (((entry->GetFlags() & wxACCEL_CTRL) == 0) || event.ControlDown()) && (((entry->GetFlags() & wxACCEL_SHIFT) == 0) || event.ShiftDown()) && @@ -99,7 +99,7 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event ) { return entry->GetCommand(); } - node = node->Next(); + node = node->GetNext(); } return -1;