redraw forced for size changes (layout for measuring is simpler than word-wrapping...

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

diff --git a/src/mac/accel.cpp b/src/mac/accel.cpp
index 181460adf445d2a2ee12e19aca7cb9f0df59f6d8..14aa88e53a85fa2c05d76354fb15f32f314257d1 100644 (file)
--- a/src/mac/accel.cpp
+++ b/src/mac/accel.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        accel.cpp
 // Purpose:     wxAcceleratorTable
 /////////////////////////////////////////////////////////////////////////////
 // Name:        accel.cpp
 // Purpose:     wxAcceleratorTable

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -46,8 +46,8 @@ public:
 #define M_ACCELDATA ((wxAcceleratorRefData *)m_refData)
 
 wxAcceleratorRefData::wxAcceleratorRefData()
 #define M_ACCELDATA ((wxAcceleratorRefData *)m_refData)
 
 wxAcceleratorRefData::wxAcceleratorRefData()

+    : m_accels()

 {
 {

-    m_accels.DeleteContents( TRUE );

 }
 
 wxAcceleratorRefData::~wxAcceleratorRefData()
 }
 
 wxAcceleratorRefData::~wxAcceleratorRefData()


@@ -57,7 +57,7 @@ wxAcceleratorRefData::~wxAcceleratorRefData()
 
 wxAcceleratorTable::wxAcceleratorTable()
 {
 
 wxAcceleratorTable::wxAcceleratorTable()
 {

-  m_refData = NULL;
+    m_refData = NULL;

 }
 
 wxAcceleratorTable::~wxAcceleratorTable()
 }
 
 wxAcceleratorTable::~wxAcceleratorTable()


@@ -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;