Make wxr resources work in Unicode mode.

[wxWidgets.git] / src / mac / carbon / accel.cpp

diff --git a/src/mac/carbon/accel.cpp b/src/mac/carbon/accel.cpp
index 798aa720268d1268858fe239dd4baa9614ad1e7a..0623dc8dd504af42b604a1d22f89b4f6dbe7dd85 100644 (file)
--- a/src/mac/carbon/accel.cpp
+++ b/src/mac/carbon/accel.cpp
@@ -65,7 +65,7 @@ wxAcceleratorTable::~wxAcceleratorTable()
 }
 
 // Create from an array
 }
 
 // Create from an array

-wxAcceleratorTable::wxAcceleratorTable(int n, wxAcceleratorEntry entries[])
+wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])

 {
     m_refData = new wxAcceleratorRefData;
 
 {
     m_refData = new wxAcceleratorRefData;
 


@@ -88,10 +88,10 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
 {
     if (!Ok()) return -1;
 
 {
     if (!Ok()) return -1;
 

-    wxNode *node = M_ACCELDATA->m_accels.First();
+    wxAccelList::Node *node = M_ACCELDATA->m_accels.GetFirst();

     while (node)
     {
     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()) &&
         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();
         }
         {
             return entry->GetCommand();
         }

-        node = node->Next();
+        node = node->GetNext();

     }
 
     return -1;
     }
 
     return -1;